Auto merge of #2967 - frewsxcv:clippy, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 7 Aug 2016 02:20:17 +0000 (19:20 -0700)
committerGitHub <noreply@github.com>
Sun, 7 Aug 2016 02:20:17 +0000 (19:20 -0700)
Address some clippy lints.

None


Trivial merge